Few updates to make it work better in other projects