Update to Propel module - just testing, will implement further on