Added initial value support
Initial Value Support, fixed instantiations