created separate mapping class