572 enhanced service

Related to #572