Implemented missing functionality (was throwing UnsupportedOperationException)