Feature refactoring

@alexandervanbrakel