Added custom mappers and switched tabs to spaces