Updated System with Prop & environment Database