#567: Initial implementation