Fix application of nullable: constraint
Add Map versions of Find and FindAll
Code formatting