separate dto bean, updating annotations, small fixes