Added dynamic properties- hope nothing is broken