Few tweaks, adding in PostgreSQL as main db
Adding in guard and all kinds of stuff