Switched Model::dq from method to attribute and added POD