New class and zul file and some updates