Update: Constructor now takes property file