Adding ChangeInterval constriction and empty checks