Adding complete reference to Gateway class