Move firstByAttributes to Builder class