More compatibility with standard java package