Added missing lazy classes