Adding support for signle entry view and stuff like that