legacy support added