Removed dependance on external modules