Simplified requirements just to get unit tests passing