Added NEI support and frame blocking