Update makefile & module usage