Added bundle enabled check in controllers