diff --git a/assets/js/admin/sportspress-admin.js b/assets/js/admin/sportspress-admin.js
index a6b9ce0a..ca7c70b1 100644
--- a/assets/js/admin/sportspress-admin.js
+++ b/assets/js/admin/sportspress-admin.js
@@ -620,4 +620,83 @@ jQuery(document).ready(function($){
 	$(".sp-select-sport").change(function() {
 		$(".sp-configure-sport").hide();
 	});
+
+	// Ajax checklist
+	$(".sp-ajax-checklist").siblings(".sp-tab-select").find("select").change(function() {
+		$(this).closest(".sp-tab-select").siblings(".sp-ajax-checklist").find("ul").html("<li>" + localized_strings.loading + "</li>");
+		$.post( ajaxurl, {
+			action:         "sp-get-players",
+			team: 			$(this).val(),
+			league: 		('yes' == localized_strings.option_filter_by_league) ? $("select[name=\"tax_input[sp_league][]\"]").val() : null,
+			season: 		('yes' == localized_strings.option_filter_by_season) ? $("select[name=\"tax_input[sp_season][]\"]").val() : null,
+			index: 			$(this).closest(".sp-instance").index(),
+			nonce:          $("#sp-get-players-nonce").val()
+		}).done(function( response ) {
+			index = response.data.index;
+			$target = $(".sp-instance").eq(index).find(".sp-ajax-checklist ul");
+			if ( response.success ) {
+				$target.html("");
+				if(response.data.players.length) {
+					$target.eq(0).append("<li class=\"sp-select-all-container\"><label class=\"selectit\"><input type=\"checkbox\" class=\"sp-select-all\"><strong>" + localized_strings.select_all + "</strong></li>");
+					$(response.data.players).each(function( key, value ) {
+						$target.eq(0).append("<li><label class=\"selectit\"><input type=\"checkbox\" value=\"" + value.ID + "\" name=\"sp_player[" + index + "][]\">" + value.post_title + "</li>");
+					});
+					$target.eq(0).append("<li class=\"sp-ajax-show-all-container\"><a class=\"sp-ajax-show-all\" href=\"#show-all-sp_players\">" + localized_strings.show_all + "</a></li>");
+				} else {
+					$target.eq(0).html("<li>" + localized_strings.no_results_found + " <a class=\"sp-ajax-show-all\" href=\"#show-all-sp_players\">" + localized_strings.show_all + "</a></li>");
+				}
+				if(response.data.staff.length) {
+					$target.eq(1).append("<li class=\"sp-select-all-container\"><label class=\"selectit\"><input type=\"checkbox\" class=\"sp-select-all\"><strong>" + localized_strings.select_all + "</strong></li>");
+					$(response.data.staff).each(function( key, value ) {
+						$target.eq(1).append("<li><label class=\"selectit\"><input type=\"checkbox\" value=\"" + value.ID + "\" name=\"sp_staff[" + index + "][]\">" + value.post_title + "</li>");
+					});
+					$target.eq(1).append("<li class=\"sp-ajax-show-all-container\"><a class=\"sp-ajax-show-all\" href=\"#show-all-sp_staffs\">" + localized_strings.show_all + "</a></li>");
+				} else {
+					$target.eq(1).html("<li>" + localized_strings.no_results_found + " <a class=\"sp-ajax-show-all\" href=\"#show-all-sp_staffs\">" + localized_strings.show_all + "</a></li>");
+				}
+			} else {
+				$target.html("<li>" + localized_strings.no_results_found + "</li>");
+			}
+		});
+	});
+
+	// Activate Ajax trigger
+	$(".sp-ajax-trigger").change(function() {
+		$(".sp-ajax-checklist").siblings(".sp-tab-select").find("select").change();
+	});
+
+	// Ajax show all filter
+	$(".sp-tab-panel").on("click", ".sp-ajax-show-all", function() {
+		index = $(this).closest(".sp-instance").index();
+		$(this).parent().html(localized_strings.loading);
+		$.post( ajaxurl, {
+			action:         "sp-get-players",
+			index: 			index,
+			nonce:          $("#sp-get-players-nonce").val()
+		}).done(function( response ) {
+			index = response.data.index;
+			console.log(index);
+			$target = $(".sp-instance").eq(index).find(".sp-ajax-checklist ul");
+			$target.find(".sp-ajax-show-all-container").hide();
+			if ( response.success ) {
+				if(response.data.players.length) {
+					$(response.data.players).each(function( key, value ) {
+						if($target.find("input[value=" + value.ID + "]").length) return true;
+						$target.eq(0).append("<li><label class=\"selectit\"><input type=\"checkbox\" value=\"" + value.ID + "\" name=\"sp_player[" + index + "][]\">" + value.post_title + "</li>");
+					});
+				} else {
+					$target.eq(0).html("<li>" + localized_strings.no_results_found + "</li>");
+				}
+				if(response.data.staff.length) {
+					$(response.data.staff).each(function( key, value ) {
+						$target.eq(1).append("<li><label class=\"selectit\"><input type=\"checkbox\" value=\"" + value.ID + "\" name=\"sp_staff[" + index + "][]\">" + value.post_title + "</li>");
+					});
+				} else {
+					$target.eq(1).html("<li>" + localized_strings.no_results_found + "</li>");
+				}
+			} else {
+				$target.html("<li>" + localized_strings.no_results_found + "</li>");
+			}
+		});
+	});
 });
\ No newline at end of file
diff --git a/includes/class-sp-modules.php b/includes/class-sp-modules.php
index e39411db..a370f702 100644
--- a/includes/class-sp-modules.php
+++ b/includes/class-sp-modules.php
@@ -113,13 +113,6 @@ class SP_Modules {
 					'link' => 'http://tboy.co/pro',
 					'desc' => __( 'Clone anything with just one click. Great for creating multiple events.', 'sportspress' ),
 				),
-				'lazy_loading' => array(
-					'label' => __( 'Lazy Loading', 'sportspress' ),
-					'class' => 'SportsPress_Lazy_Loading',
-					'icon' => 'sp-icon-moon',
-					'link' => 'http://tboy.co/pro',
-					'desc' => __( 'Load players using Ajax to speed up the event edit screen.', 'sportspress' ),
-				),
 			),
 			'other' => array(
 				'twitter' => array(
diff --git a/modules/sportspress-lazy-loading.php b/modules/sportspress-lazy-loading.php
new file mode 100644
index 00000000..5bc6f2be
--- /dev/null
+++ b/modules/sportspress-lazy-loading.php
@@ -0,0 +1,213 @@
+<?php
+/*
+Plugin Name: SportsPress Lazy Loading
+Plugin URI: http://tboy.co/pro
+Description: Load players using Ajax to speed up the event edit screen.
+Author: ThemeBoy
+Author URI: http://themeboy.com
+Version: 1.9
+*/
+
+// Exit if accessed directly
+if ( ! defined( 'ABSPATH' ) ) exit;
+
+if ( ! class_exists( 'SportsPress_Lazy_Loading' ) ) :
+
+/**
+ * Main SportsPress Lazy Loading Class
+ *
+ * @class SportsPress_Lazy_Loading
+ * @version	1.9
+ */
+class SportsPress_Lazy_Loading {
+
+	/**
+	 * Constructor
+	 */
+	public function __construct() {
+		add_action( 'wp_ajax_sp-get-players', array( $this, 'get_players' ) );
+		add_action( 'sportspress_event_teams_meta_box_checklist', array( $this, 'checklist' ), 10, 6 );
+		add_filter( 'sportspress_localized_strings', array( $this, 'strings' ) );
+		add_filter( 'sportspress_event_teams_meta_box_default_checklist', '__return_false' );
+	}
+
+	/**
+	 * Get players.
+	 */
+	public function get_players() {
+		check_ajax_referer( 'sp-get-players', 'nonce' );
+
+		$team = sp_array_value( $_POST, 'team' );
+		$league = sp_array_value( $_POST, 'league' );
+		$season = sp_array_value( $_POST, 'season' );
+		$index = sp_array_value( $_POST, 'index', 1 );
+		$selected = sp_array_value( $_POST, 'selected', array() );
+
+		$args = array(
+			'orderby' => 'menu_order',
+		);
+
+		if ( $team ) {
+			$args['meta_query'] = array(
+				array(
+					'key' => 'sp_current_team',
+					'value' => sp_array_value( $_POST, 'team' ),
+				),
+			);
+		}
+
+		if ( $league || $season ) {
+			$args['tax_query'] = array( 'relation' => 'AND' );
+
+			if ( $league ) {
+				$args['tax_query'][] = array(
+					'taxonomy' => 'sp_league',
+					'field' => 'id',
+					'terms' => $league,
+				);
+			}
+
+			if ( $season ) {
+				$args['tax_query'][] = array(
+					'taxonomy' => 'sp_season',
+					'field' => 'id',
+					'terms' => $season,
+				);
+			}
+		}
+
+		$player_args = $args;
+		$player_args['meta_key'] = 'sp_number';
+		$player_args['orderby'] = 'meta_value_num';
+		$player_args['order'] = 'ASC';
+
+		$players = sp_get_posts( 'sp_player', $player_args );
+		$staff = sp_get_posts( 'sp_staff', $args );
+		$data = array( 'index' => $index );
+
+		foreach ( $players as $key => $value ) {
+			$players[ $key ]->post_title = sp_get_player_name_with_number( $value->ID );
+		}
+
+		$data['players'] = $players;
+		$data['staff'] = $staff;
+		wp_send_json_success( $data );
+	}
+
+	/**
+	 * Ajax checklist.
+	 */
+	public function checklist( $post_id = null, $post_type = 'post', $display = 'block', $team = null, $index = null, $slug = null ) {
+		if ( ! isset( $slug ) ):
+			$slug = $post_type;
+		endif;
+		
+		$selected = (array)get_post_meta( $post_id, $slug, false );
+		if ( sizeof( $selected ) ) {
+			$selected = sp_array_between( $selected, 0, $index );
+		} else {
+			$selected = sp_array_between( (array)get_post_meta( $post_id, $post_type, false ), 0, $index );
+		}
+
+		$leagues = get_the_terms( $post_id, 'sp_league' );
+		$seasons = get_the_terms( $post_id, 'sp_season' );
+
+		$args = array(
+			'orderby' => 'menu_order',
+		);
+
+		if ( 'sp_player' == $post_type ):
+			$args['meta_key'] = 'sp_number';
+			$args['orderby'] = 'meta_value_num';
+			$args['order'] = 'ASC';
+		endif;
+
+		$args['meta_query'] = array(
+			array(
+				'key' => 'sp_current_team',
+				'value' => $team,
+			),
+		);
+
+		if ( $leagues || $seasons ) {
+			$args['tax_query'] = array( 'relation' => 'AND' );
+
+			if ( $leagues ) {
+				$args['tax_query'][] = array(
+					'taxonomy' => 'sp_league',
+					'field' => 'id',
+					'terms' => wp_list_pluck( $leagues, 'term_id' ),
+				);
+			}
+
+			if ( $seasons ) {
+				$args['tax_query'][] = array(
+					'taxonomy' => 'sp_season',
+					'field' => 'id',
+					'terms' => wp_list_pluck( $seasons, 'term_id' ),
+				);
+			}
+		}
+
+		$posts = sp_get_posts( $post_type, $args );
+		$post_ids = wp_list_pluck( $posts, 'ID' );
+		$diff = array_diff( $post_ids, $selected );
+		$selected = array_flip( $selected );
+		?>
+		<div id="<?php echo $slug; ?>-all" class="posttypediv wp-tab-panel sp-tab-panel sp-ajax-checklist sp-select-all-range" style="display: <?php echo $display; ?>;">
+			<input type="hidden" value="0" name="<?php echo $slug; ?><?php if ( isset( $index ) ) echo '[' . $index . ']'; ?>[]" />
+			<ul class="categorychecklist form-no-clear">
+				<?php if ( is_array( $posts ) && sizeof( $posts ) ) { ?>
+					<li class="sp-select-all-container">
+						<label class="selectit">
+							<input type="checkbox" class="sp-select-all" <?php checked( empty( $diff ) ); ?>>
+							<strong><?php _e( 'Select All', 'sportspress' ); ?></strong>
+						</label>
+					</li>
+					<?php foreach ( $posts as $post ) { ?>
+						<li>
+							<label class="selectit">
+								<input type="checkbox" value="<?php echo $post->ID; ?>" name="<?php echo $slug; ?><?php if ( isset( $index ) ) echo '[' . $index . ']'; ?>[]" <?php checked( array_key_exists( $post->ID, $selected ) ); ?>>
+								<?php echo sp_get_player_name_with_number( $post->ID ); ?>
+							</label>
+						</li>
+						<?php unset( $selected[ $post->ID ] ); ?>
+					<?php } ?>
+					<?php if ( is_array( $selected ) && sizeof( $selected ) ) { foreach ( $selected as $post_id => $post ) { ?>
+						<?php if ( ! $post_id ) continue; ?>
+						<li>
+							<label class="selectit">
+								<input type="checkbox" value="<?php echo $post_id; ?>" name="<?php echo $slug; ?><?php if ( isset( $index ) ) echo '[' . $index . ']'; ?>[]" <?php checked( true ); ?>>
+								<?php echo sp_get_player_name_with_number( $post_id ); ?>
+							</label>
+						</li>
+					<?php } } ?>
+					<li class="sp-ajax-show-all-container"><a class="sp-ajax-show-all" href="#show-all-<?php echo $slug; ?>s"><?php _e( 'Show all', 'sportspress' ); ?></a></li>
+				<?php } else { ?>
+					<li class="sp-ajax-show-all-container"><?php _e( 'No results found.', 'sportspress' ); ?>
+					<a class="sp-ajax-show-all" href="#show-all-<?php echo $slug; ?>s"><?php _e( 'Show all', 'sportspress' ); ?></a></li>
+				<?php } ?>
+			</ul>
+		</div>
+		<?php
+	}
+
+	/*
+	 * Localized strings.
+	 */
+	public function strings( $strings ) {
+		$strings = array_merge( $strings, array(
+			'no_results_found' => __( 'No results found.', 'sportspress' ),
+			'select_all' => __( 'Select All', 'sportspress' ),
+			'show_all' => __( 'Show all', 'sportspress' ),
+			'loading' => __( 'Loading&hellip;', 'sportspress' ),
+			'option_filter_by_league' => get_option( 'sportspress_event_filter_teams_by_league', 'no' ),
+			'option_filter_by_season' => get_option( 'sportspress_event_filter_teams_by_season', 'no' ),
+		) ) ;
+		return $strings;
+	}
+}
+
+endif;
+
+new SportsPress_Lazy_Loading();
\ No newline at end of file