Initial changes to extend object