Interface unification
dev