New functionalities and some design adjusts