fix @attributes location bug, move dsl up to moudle
fix bug