Removed dependancy on 5.010
Easier usage