Added current/active support
Added support for active/current