Changed aspectjweaver to be optional