Added BayTech and SunLocation support