Continuing attributes selector refactor