Added complex feature implementation