Improve prepare service