More enhancements on deposits before adding business logic.