Added numpy handling and added new module