Updating model to 4.1 methods, check issue 63