Service Handler optimizations and technical debt