Added enabled check