Added TODO item
Updated properties for modularity
Added correct type to properties