#58 Better implementation of views