Moved implementation to "simple" package