Refactoring
View support added