Added @property at MartinNowak's request