Include default permissions, misc cleanup and optimization