Feature/custom attributes