separated model
minor service fix