Added property annotations in models