Improve mappers, adapters and add views