Clean up attribute dsl a bit
Rename {AttributeDSL=>MapperDSL} and move requires