Fix handling of Property as a Source for Model. Close #18