Gets rid of the usage of deprecated properties

Gets rid of the usage of deprecated properties

Fixes #27