Added GET + Refined POST methods