added generic property
removed unused usings