Improve business layer a little bit