More features and mocks