Remove AttributesMixin
Update template tag
fix imports
merge