Minor additions - compilation still not verified