Add properties to container class
Minor improvements