Removed data properties to simplify (work in progress)