Added getProperty everywhere