Breaking out where clauses
Abstracting ASG naming and versioning