Move attribute definitions to proper place