Changed package reference and bug fixes in generator