Add Coordinator and utilities