Major commit with new features