updated to psr-4
added isActive filtering